mm/page_alloc: Avoid ABI change in 4.9.65
authorBen Hutchings <ben@decadent.org.uk>
Wed, 29 Nov 2017 20:05:45 +0000 (20:05 +0000)
committerYves-Alexis Perez <corsac@debian.org>
Thu, 4 Jan 2018 11:12:40 +0000 (11:12 +0000)
Commit d135e5750205 "mm/page_alloc.c: broken deferred calculation"
renamed pglist_data::static_init_size to static_init_pgcnt.  However
the field has the same semantics as were intended originally (and in
any case, the field is only used by built-in code).  Hide the renaming
from genksyms.

Gbp-Pq: Topic debian
Gbp-Pq: Name mm-page_alloc-avoid-abi-change-in-4.9.65.patch

include/linux/mmzone.h

index 490f5a83f94768d1eb02b6099e68010634b3ba7d..1192eb029c5b5cebce0d6a1efb3aad3f3f5a9fea 100644 (file)
@@ -674,7 +674,11 @@ typedef struct pglist_data {
         */
        unsigned long first_deferred_pfn;
        /* Number of non-deferred pages */
+#ifndef __GENKSYMS__
        unsigned long static_init_pgcnt;
+#else
+       unsigned long static_init_size;
+#endif
 #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE